jets 1.9.7 → 1.9.8

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

@@ -1,4 +1,4 @@
-class Jets::Cfn::Builders
+module Jets::Cfn::Builders
   class ApiDeploymentBuilder
     include Interface
     include Jets::AwsServices

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

@@ -1,4 +1,4 @@
-class Jets::Cfn::Builders
+module Jets::Cfn::Builders
   class ApiGatewayBuilder
     include Interface
     include Jets::AwsServices

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

@@ -5,7 +5,7 @@
 # FYI
 #
 #   * compose implemented by the classes that include this
-class Jets::Cfn::Builders
+module Jets::Cfn::Builders
   class BaseChildBuilder
     include Interface
 

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

@@ -3,7 +3,7 @@
 #   compose
 #   template_path
 #
-class Jets::Cfn::Builders
+module Jets::Cfn::Builders
   class ControllerBuilder < BaseChildBuilder
     # compose is an interface method for Interface module
     def compose

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

@@ -3,7 +3,7 @@
 #   compose
 #   template_path
 #
-class Jets::Cfn::Builders
+module Jets::Cfn::Builders
   class FunctionBuilder < BaseChildBuilder
     # compose is an interface method for Interface module
     def compose

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

@@ -2,7 +2,7 @@
 #
 #   * compose
 #   * template_path
-class Jets::Cfn::Builders
+module Jets::Cfn::Builders
   module Interface
     extend Memoist
 

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

@@ -3,7 +3,7 @@
 #   compose
 #   template_path
 #
-class Jets::Cfn::Builders
+module Jets::Cfn::Builders
   class JobBuilder < BaseChildBuilder
     def compose
       add_common_parameters

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

@@ -1,6 +1,6 @@
 require 'erb'
 
-class Jets::Cfn::Builders
+module Jets::Cfn::Builders
   class ParentBuilder
     include Interface
     include Jets::AwsServices

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

@@ -3,7 +3,7 @@
 #   compose
 #   template_path
 #
-class Jets::Cfn::Builders
+module Jets::Cfn::Builders
   class RuleBuilder < BaseChildBuilder
     def compose
       add_common_parameters

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

@@ -1,4 +1,4 @@
-class Jets::Cfn::Builders
+module Jets::Cfn::Builders
   class SharedBuilder < BaseChildBuilder
     def compose
       stack = @app_class.new # @app_class is subclass. IE: Alarm < Jets::Stack

data/lib/jets/cfn/ship.rb

@@ -1,4 +1,4 @@
-class Jets::Cfn
+module Jets::Cfn
   class Ship
     extend Memoist
     include Jets::AwsServices
@@ -96,11 +96,7 @@ class Jets::Cfn
       return if Jets.poly_only?
 
       puts "Prewarming application."
-      if Jets::PreheatJob::CONCURRENCY > 1
-        Jets::PreheatJob.perform_now(:torch, {quiet: true})
-      else
-        Jets::PreheatJob.perform_now(:warm, {quiet: true})
-      end
+      Jets::PreheatJob.prewarm!
     end
 
     def clean_deploy_logs

data/lib/jets/cfn/status.rb

@@ -1,4 +1,4 @@
-class Jets::Cfn
+module Jets::Cfn
   class Status
     include Jets::AwsServices
 

data/lib/jets/cfn/upload.rb

@@ -1,7 +1,7 @@
 require 'action_view'
 require 'digest'
 
-class Jets::Cfn
+module Jets::Cfn
   class Upload
     include Jets::AwsServices
     include ActionView::Helpers::NumberHelper # number_to_human_size

data/lib/jets/cli.rb

@@ -15,49 +15,54 @@ class Jets::CLI
   end
 
   def start
+    # Needs to be at the beginning to avoid boot_jets which causes some load errors
+    if version_requested?
+      puts Jets.version
+      return
+    end
+
+    # Need to boot jets at this point for commands like: jets routes, deploy, console, etc to work
+    boot_jets
     command_class = lookup(full_command)
     if command_class
-      boot_jets
       command_class.perform(full_command, thor_args)
-    elsif version_requested?
-      puts Jets.version
     else
       main_help
     end
   end
 
-  def version_requested?
-    #   jets --version
-    #   jets -v
-    version_flags = ["--version", "-v"]
-    @given_args.length == 1 && !(@given_args & version_flags).empty?
-  end
-
-  # The commands new and help do not call Jets.boot. Main reason is that
-  # Jets.boot are ran inside a Jets project folder.
+  # The commands new and help do not call Jets.boot. Main reason is that Jets.boot should be run in a Jets project.
+  #
+  #   * jets new - need to generate a project outside a project folder.
+  #   * jets help - don't need to be in a project folder general help.
   #
-  # * jets new - need to generate a project outside a project folder.
-  # * jets help - don't need to be in a project folder general help.
-  #   When you are inside a project folder though, more help commands
-  #   are available and displayed.
+  # When you are inside a project folder though, more help commands are available and displayed.
   #
   def boot_jets
+    set_jets_env_from_cli_arg!
     command = thor_args.first
-    if !%w[new help].include?(command)
-      set_jets_env_from_cli_arg!
+    unless %w[new help].include?(command)
+      Jets::Turbo.new.charge # handles Afterburner mode
       Jets.boot
     end
   end
 
-  # Adjust JETS_ENV before boot_jets is called for the jets deploy
-  # command.  Must do this early in the process before Jets.boot because
-  # Jets.boot calls Jets.env as part of the bootup process in
-  # require_bundle_gems and sets the Jets.env to whatever the JETS_ENV is
-  # at the time.
+  def version_requested?
+    #   jets --version
+    #   jets -v
+    version_flags = ["--version", "-v"]
+    @given_args.length == 1 && !(@given_args & version_flags).empty?
+  end
+
+  # Adjust JETS_ENV before boot_jets is called for the `jets deploy` command.  Must do this early in the process
+  # before Jets.boot because because `bundler_require` is called as part of the bootup process. It sets the Jets.env
+  # to whatever the JETS_ENV is at the time to require the right bundler group.
   #
   # Defaults to development when not set.
   def set_jets_env_from_cli_arg!
-    command, env = thor_args[0..1]
+    # Pretty tricky, we need to use the raw @given_args as thor_args eventually calls Commands::Base#eager_load!
+    # which uses Jets.env before we get a chance to override ENV['JETS_ENV']
+    command, env = @given_args[0..1]
     return unless %w[deploy delete].include?(command)
     env = nil if env&.starts_with?('-')
     return unless env
@@ -87,6 +92,16 @@ class Jets::CLI
     args.compact
   end
 
+  def meth
+    return nil unless full_command
+
+    if full_command.include?(':')
+      full_command.split(':').pop
+    else
+      full_command
+    end
+  end
+
   ALIASES = {
     "g"  => "generate",
     "c"  => "console",
@@ -132,16 +147,6 @@ class Jets::CLI
     end
   end
 
-  def meth
-    return nil unless full_command
-
-    if full_command.include?(':')
-      full_command.split(':').pop
-    else
-      full_command
-    end
-  end
-
   def main_help
     shell = Thor::Shell::Basic.new
     shell.say "Commands:"

data/lib/jets/commands/base.rb

@@ -51,27 +51,6 @@ class Jets::Commands::Base < Thor
       end
     end
 
-    # Useful for help menu when we need to have all the definitions loaded.
-    # Using constantize instead of require so we dont care about
-    # order. The eager load actually uses autoloading.
-    def eager_load!
-      base_path = File.expand_path("../../", __FILE__)
-      Dir.glob("#{base_path}/commands/**/*.rb").select do |path|
-        next if !File.file?(path) or path =~ /templates/ or path =~ %r{/markdown/}
-
-        class_name = path
-                      .sub(/\.rb$/,'')
-                      .sub(%r{.*/jets/commands}, 'jets/commands')
-                      .camelize
-        class_name = special_class_map(class_name)
-        # NOTE: Weird thing where Jets::Commands::Db::Task => Thor::Command
-        # because Task is a class available to Thor I believe.
-        # puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['JETS_DEBUG']
-        class_name.constantize # dont have to worry about order.
-      end
-    end
-    memoize :eager_load!
-
     # Fully qualifed task names. Examples:
     #   build
     #   process:controller
@@ -125,19 +104,10 @@ class Jets::Commands::Base < Thor
       else
         class_name = namespace.gsub(':','/')
         class_name = "Jets::Commands::#{class_name.camelize}"
-        class_name = special_class_map(class_name)
         class_name.constantize
       end
     end
 
-    def special_class_map(class_name)
-      map = {
-        'Jets::Commands::RakeTask' => 'Jets::Commands::RakeTasks',
-        'Jets::Commands::Gem' => 'Jets::Commands::Gems',
-      }
-      map[class_name] || class_name
-    end
-
     # If this fails to find a match then return the original full command
     def autocomplete(full_command)
       return nil if full_command.nil? # jets help
@@ -160,5 +130,17 @@ class Jets::Commands::Base < Thor
         full_command # return original full_command
       end
     end
+
+    # For help menu to list all commands, we must eager load the command classes.
+    #
+    # There is special eager_load logic here because this is called super early as part of the CLI start.
+    # We cannot assume we have full access to to the project yet.
+    def eager_load!
+      return if Jets::Turbo.afterburner?
+
+      Jets.application.setup_auto_load_paths # in case an app/extension is defined
+      Jets::Autoloaders.once.eager_load
+    end
+    memoize :eager_load!
   end
 end

data/lib/jets/commands/call.rb

@@ -2,11 +2,6 @@ require "base64"
 require "json"
 
 class Jets::Commands::Call
-  autoload :BaseGuesser, "jets/commands/call/base_guesser"
-  autoload :AutoloadGuesser, "jets/commands/call/autoload_guesser"
-  autoload :AnonymousGuesser, "jets/commands/call/anonymous_guesser"
-  autoload :Guesser, "jets/commands/call/guesser"
-
   include Jets::AwsServices
 
   def initialize(provided_function_name, event, options={})

data/lib/jets/commands/clean.rb

@@ -1,9 +1,5 @@
 module Jets::Commands
   class Clean < Jets::Commands::Base
-    autoload :Base, 'jets/commands/clean/base'
-    autoload :Log, 'jets/commands/clean/log'
-    autoload :Build, 'jets/commands/clean/build'
-
     class_option :noop, type: :boolean, desc: "noop or dry-run mode"
     class_option :mute, type: :boolean, desc: "mute output"
     class_option :sure, type: :boolean, desc: "bypass are you sure prompt"

data/lib/jets/commands/console.rb

@@ -1,7 +1,6 @@
 class Jets::Commands::Console
   def self.run
     puts Jets::Booter.message
-    Jets.boot
 
     # Thanks: https://mutelight.org/bin-console
     require "irb"

data/lib/jets/commands/db.rb

@@ -1,7 +1,5 @@
 module Jets::Commands
   class Db < Jets::Commands::Base
-    autoload :Tasks, 'jets/commands/db/tasks'
-
     desc "generate", "Creates a migration to change a db table"
     long_desc Help.text('db:generate')
     def generate(*args)

data/lib/jets/commands/dynamodb.rb

@@ -1,8 +1,5 @@
 module Jets::Commands
   class Dynamodb < Jets::Commands::Base
-    autoload :Migrator, 'jets/commands/dynamodb/migrator'
-    autoload :Migrate, 'jets/commands/dynamodb/migrate'
-
     desc "migrate [path]", "Runs migrations"
     long_desc Help.text('dynamodb:migrate')
     def migrate(path)

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

@@ -28,15 +28,15 @@ For [jobs](http://rubyonjets.com/docs/jobs/), the event is passed through untouc
     jets call hard_job-drive '{"test":1}' | jq .
     jets call hard_job-drive file://event.json | jq . # load event with a file
     jets call posts_controller-index # event payload is optional
-    jets call posts_controller-index '{"test":1}' --show-log | jq .
+    jets call posts_controller-index '{"path":"/posts"}' --show-log | jq .
     jets call posts_controller-index 'file://event.json' --show-log | jq .
 
 The equivalent AWS Lambda CLI command:
 
-    aws lambda invoke --function-name demo-dev-hard_job-dig --payload '{"test":1}' outfile.txt
+    aws lambda invoke --function-name demo-dev-hard_job-dig --payload '{"path":"/posts","test":1}' outfile.txt
     cat outfile.txt | jq '.'
 
-    aws lambda invoke --function-name demo-dev-posts_controller-index --payload '{"queryStringParameters":{"test":1}}' outfile.txt
+    aws lambda invoke --function-name demo-dev-posts_controller-index --payload '{"queryStringParameters":{"path":"/posts",test":1}}' outfile.txt
     cat outfile.txt | jq '.'
 
 For convenience, you can also provide the function name with only dashes and `jets call` figures out what function you intend to call. Examples:

data/lib/jets/commands/import.rb

@@ -1,16 +1,10 @@
 module Jets::Commands
   class Import < Jets::Commands::Base
-    autoload :Base, 'jets/commands/import/base'
-    autoload :Cheatsheet, 'jets/commands/import/cheatsheet'
-    autoload :Rack, 'jets/commands/import/rack'
-    autoload :Rail, 'jets/commands/import/rail'
-    autoload :Sequence, 'jets/commands/import/sequence'
-
     Jets::Commands::Import::Base.cli_options.each do |args|
       class_option(*args)
     end
     long_desc Help.text('import:rails')
-    register(Jets::Commands::Import::Rail, "rails", "rails", "Imports rails project in the rack subfolder")
+    register(Jets::Commands::Import::Rails, "rails", "rails", "Imports rails project in the rack subfolder")
 
     long_desc Help.text('import:rack')
     register(Jets::Commands::Import::Rack, "rack", "rack", "Imports rack project in the rack subfolder")

data/lib/jets/commands/import/{rail.rb → rails.rb}

@@ -1,5 +1,5 @@
 class Jets::Commands::Import
-  class Rail < Base
+  class Rails < Base
     # We add jets-rails gem even though it's only activated within the megamode
     # rackup wrapper script so user can check run bundle install and determine early
     # if dependencies are met. The jets-rails gem is also added as part of the deploy

data/lib/jets/commands/main.rb

@@ -43,7 +43,9 @@ module Jets::Commands
       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
-      system(command)
+      Bundler.with_clean_env do
+        system(command)
+      end
     end
 
     desc "routes", "Print out your application routes"

data/lib/jets/commands/new.rb

@@ -83,7 +83,7 @@ module Jets::Commands
         exit 1
       end
 
-      command = "jets webpacker:install"
+      command = "bundle exec jets webpacker:install"
       command += " FORCE=1" if options[:force]
       run(command)
     end

data/lib/jets/commands/rake_tasks.rb

@@ -11,7 +11,8 @@ class Jets::Commands::RakeTasks
     @@loaded = false
     def load!
       return if @@loaded # prevent loading twice
-      Jets::Booter.require_bundle_gems # use bundler when in project folder
+      # Run Bundler.setup so all project rake tasks also show up in `jets help`
+      Jets::Bundle.setup
 
       Jets::Commands::Db::Tasks.load!
       load_webpacker_tasks

data/lib/jets/commands/runner.rb

@@ -1,7 +1,5 @@
 class Jets::Commands::Runner
   def self.run(code)
-    Jets.boot
-
     if code =~ %r{^file://}
       path = code.sub('file://', '')
       full_path = "#{Jets.root}/#{path}"