jets 5.0.17 → 6.0.0.beta1

data/lib/jets/thor/help.rb

@@ -0,0 +1,129 @@
+module Jets::Thor
+  module Help
+    extend ActiveSupport::Concern
+
+    def help(command = nil, subcommand = false)
+      help_output = capture_stdout_for_help { super }
+      paginate_output(help_output)
+    end
+
+    def capture_stdout_for_help
+      stdout_old = $stdout
+      io = StringIO.new
+      $stdout = io
+      yield
+      $stdout = stdout_old
+      io.string
+    end
+
+    # Method to paginate the output using less if necessary
+    def paginate_output(output)
+      unless system("type less > /dev/null 2>&1")
+        puts output
+        return
+      end
+
+      # Paginate the output if it's taller than the terminal
+      terminal_height = TTY::Screen.height
+      if output.lines.count > terminal_height
+        IO.popen("less -R", "w") { |less| less.puts(output) }
+      else
+        puts output
+      end
+    end
+
+    module ClassMethods
+      # Override command_help to include the description at the top of the
+      # long_description.
+      def command_help(shell, command_name)
+        meth = normalize_command_name(command_name)
+        command = all_commands[meth]
+        alter_command_description(command)
+        super
+      end
+
+      def alter_command_description(command)
+        return unless command
+
+        # Add description to beginning of long_description
+        long_desc = if command.long_description
+          "#{command.description}\n\n#{command.long_description}"
+        else
+          command.description
+        end
+
+        # add reference url to end of the long_description
+        unless website.empty?
+          full_command = [command.ancestor_name, command.name].compact.join("-")
+          url = "#{website}/reference/Jets::Pro-#{full_command}"
+          long_desc += "\n\nHelp also available at: #{url}"
+        end
+
+        command.long_description = long_desc
+      end
+      private :alter_command_description
+
+      # override main help menu
+      def help(shell, subcommand = false)
+        if subcommand
+          help_subcommand(shell, subcommand)
+        else
+          help_main(shell, subcommand)
+        end
+      end
+
+      def help_subcommand(shell, subcommand)
+        list = command_list(subcommand)
+        shell.say "Commands:\n\n"
+        shell.print_table(list, indent: 2, truncate: true)
+      end
+
+      def help_main(shell, subcommand = false)
+        list = command_list(subcommand)
+
+        filter = proc do |command, desc|
+          main_commands.detect { |name| command =~ Regexp.new("^jets #{name}") }
+        end
+        main = list.select(&filter)
+        other = list.reject(&filter)
+
+        shell.say "Usage: jets COMMAND [args]"
+        shell.say "\nMain Commands:\n\n"
+        shell.print_table(main, indent: 2, truncate: true)
+        shell.say "\nOther Commands:\n\n"
+        shell.print_table(other, indent: 2, truncate: true)
+        shell.say <<~EOL
+
+          For more help on each command, you can use the -h option. Example:
+
+            jets deploy -h
+
+          CLI Reference also available at: https://docs.rubyonjets.com/reference/
+        EOL
+      end
+
+      def command_list(subcommand)
+        list = printable_commands(true, subcommand)
+        Thor::Util.thor_classes_in(self).each do |klass|
+          list += klass.printable_commands(false)
+        end
+        list.reject! do |arr|
+          c = arr[0] # IE: jets release:SUBCOMMAND
+          c.include?("help") ||
+            c.include?("COMMAND") ||
+            c.include?("c_l_i")
+        end
+        sort_commands!(list)
+        list
+      end
+
+      def main_commands
+        %w[
+          deploy
+          logs
+          url
+        ]
+      end
+    end
+  end
+end

data/lib/jets/thor/project_check.rb

@@ -0,0 +1,50 @@
+module Jets::Thor
+  class ProjectCheck
+    class NotProjectError < StandardError; end
+
+    def initialize(args)
+      @args = args
+    end
+
+    def check!
+      return if no_project_command? || project?
+      raise NotProjectError, "Not a Jets project. Please run this command from a Jets project folder."
+    end
+
+    def project?
+      File.exist?("config/jets")
+    end
+
+    # Tricky: Thor load the command and then the subcommand.
+    # IE: jets generate:event
+    #     @args = ["generate", "event"] # first pass
+    #     @args = ["event"]             # second pass
+    # We only check first pass to see if it is a no_project_command.
+    # And cache it so the second pass never occurs.
+    @@no_project_command = nil
+    def no_project_command?
+      return @@no_project_command unless @@no_project_command.nil?
+      @@no_project_command = (no_project_commands & @args).any? || @args.empty?
+    end
+
+    def no_project_commands
+      # generate for generate:event
+      # Allow generate in case `jets init` has not been called yet and user
+      # can generate event classes before `jets init` is called.
+      #
+      # The delete command is a special case. It is allowed to run without a project
+      # in an empty folder. This is because the delete command is used to clean up
+      # Jets API deployment record.
+      commands = %w[
+        delete
+        generate
+        init
+        login
+        logout
+        projects
+        version
+      ]
+      commands + Jets::Thor::Base.help_flags + Jets::Thor::Base.version_flags
+    end
+  end
+end

data/lib/jets/thor/shared_options.rb

@@ -0,0 +1,31 @@
+module Jets::Thor
+  # Not naming Options to avoid conflict with Thor::Options
+  module SharedOptions
+    extend ActiveSupport::Concern
+    module ClassMethods
+      def paging_options(defaults = {})
+        option :limit, default: defaults[:limit] || 25, aliases: :l, type: :numeric, desc: "Per page limit"
+        option :order, default: defaults[:order] || "asc", aliases: :o, desc: "Order: asc or desc"
+        option :page, aliases: :p, type: :numeric, desc: "Page number"
+      end
+
+      def yes_option
+        option :yes, aliases: :y, type: :boolean, desc: "Skip are you sure prompt"
+      end
+
+      def format_option(defaults = {})
+        default = defaults[:default] || "table"
+        option :format, default: default, desc: "Output format: #{CliFormat.formats.join(", ")}"
+      end
+
+      def verbose_option
+        option :verbose, aliases: :v, default: false, type: :boolean, desc: "Show more verbose logging output. Useful for debugging what's under the hood"
+      end
+
+      def function_name_option(defaults = {})
+        default = defaults[:default] || "controller"
+        option :function, aliases: :n, default: default, desc: "Lambda Function name"
+      end
+    end
+  end
+end

data/lib/jets/thor/version_check.rb

@@ -0,0 +1,51 @@
+require "fileutils"
+require "gems"
+
+module Jets::Thor
+  class VersionCheck
+    def check!
+      return unless check_needed?
+
+      remote_version = Gems.info("jets")["version"]
+      local_version = Gem.loaded_specs["jets"].version
+
+      return if remote_version.nil?
+
+      if Gem::Version.new(remote_version) > Gem::Version.new(local_version)
+        puts <<~EOL
+          jets has a newer version available.
+
+          installed version: #{local_version}
+          latest version:    #{remote_version}
+
+          Please update jets
+        EOL
+      end
+
+      save_last_checked_time
+    end
+
+    def check_needed?
+      check_interval = 24 * 60 * 60  # 24 hours in seconds
+      Time.now - last_checked_time >= check_interval
+    end
+
+    def last_checked_time
+      last_time = File.exist?(last_check_file) ? File.read(last_check_file) : "1970-01-01 00:00:00 UTC"
+      Time.parse(last_time)
+    end
+
+    def save_last_checked_time
+      FileUtils.mkdir_p(File.dirname(last_check_file))
+      File.write(last_check_file, Time.now)
+    end
+
+    def last_check_file
+      # Do not define last_check_file as a LAST_CHECK_FILE constant
+      # On AWS lambda, Jets eager load errors since ENV["HOME"] is nil
+      # Note: Added an extra safeguard in case ENV["HOME"] is nil
+      home = ENV["HOME"] || "/root"
+      File.join(home, ".jets/tmp/last-checked.txt")
+    end
+  end
+end

data/lib/jets/util/call_line.rb

@@ -0,0 +1,9 @@
+module Jets::Util
+  module CallLine
+    include Pretty
+
+    def jets_call_line
+      caller.find { |l| l.include?("#{Jets.root}/") }
+    end
+  end
+end

data/lib/jets/util/camelize.rb

@@ -1,4 +1,4 @@
-class Jets::Util
+module Jets::Util
   module Camelize
     # Not named camelize! because it conflicts with zeitwerk's camelize!
     def camelize(object)

data/lib/jets/util/git.rb

@@ -0,0 +1,11 @@
+module Jets::Util
+  module Git
+    def git?
+      File.exist?("#{Jets.root}/.git") && git_installed?
+    end
+
+    def git_installed?
+      system("type git > /dev/null 2>&1")
+    end
+  end
+end

data/lib/jets/util/logging.rb

@@ -0,0 +1,16 @@
+module Jets::Util
+  module Logging
+    # Both work within the Jets source code.
+    #
+    #   logger.info
+    #   log.info (encouraged)
+    #
+    # Jets.logger also points to this via jets/core.rb by default.
+    # Hoewever, it can be overridden by other frameworks.
+    #
+    delegate :logger, to: "Jets.bootstrap.config"
+    def log
+      logger
+    end
+  end
+end

data/lib/jets/util/pretty.rb

@@ -0,0 +1,23 @@
+module Jets::Util
+  module Pretty
+    def pretty_path(path)
+      path.sub("#{Jets.root}/", "").sub(/^\.\//, "")
+    end
+
+    # Replace HOME with ~ - different from the main pretty_path
+    def pretty_home(path)
+      path.sub(ENV["HOME"], "~")
+    end
+
+    # http://stackoverflow.com/questions/4175733/convert-duration-to-hoursminutesseconds-or-similar-in-rails-3-or-ruby
+    def pretty_time(total_seconds)
+      minutes = (total_seconds / 60) % 60
+      seconds = total_seconds % 60
+      if total_seconds < 60
+        "#{seconds.to_i}s"
+      else
+        "#{minutes.to_i}m #{seconds.to_i}s"
+      end
+    end
+  end
+end

data/lib/jets/util/sh.rb

@@ -0,0 +1,38 @@
+module Jets::Util
+  module Sh
+    def sh(command, options = {})
+      quiet = options[:quiet]
+      on_fail = options[:on_fail] || :raise
+
+      puts "=> #{command}" unless quiet
+      system(command)
+      success = $?.success?
+
+      case on_fail
+      when :raise
+        raise Jets::Error.new("Command failed: #{command}\n#{caller(1..1).first}") unless success
+      when :exit
+        unless success
+          if quiet
+            abort("Command failed: #{command}\n")
+          else
+            abort("Command failed: #{command}\n#{caller.join("\n")}")
+          end
+        end
+      end
+
+      success
+    end
+
+    def quiet_sh(command, options = {})
+      options = options.merge(quiet: true) unless ENV["JETS_DEBUG"]
+      sh(command, options)
+    end
+
+    def capture(command)
+      out = `#{command}`.strip
+      raise Jets::Error.new("Command failed: #{command}\n#{caller(1..1).first}") unless $?.success?
+      out
+    end
+  end
+end

data/lib/jets/util/sure.rb

@@ -0,0 +1,25 @@
+module Jets::Util
+  module Sure
+    private
+
+    def sure?(message = nil)
+      confirm = "Are you sure?"
+      if @options[:yes]
+        yes = "y"
+      else
+        out = if message
+          "#{message}\n#{confirm} (y/N) "
+        else
+          "#{confirm} (y/N) "
+        end
+        print out
+        yes = $stdin.gets
+      end
+
+      unless /^y/.match?(yes)
+        puts "Whew! Exiting."
+        exit 0
+      end
+    end
+  end
+end

data/lib/jets/util/truthy.rb

@@ -0,0 +1,9 @@
+module Jets::Util
+  module Truthy
+    # Allows use non-truthy values like
+    #   n no false off null nil 0
+    def truthy?(value)
+      %w[y yes true on 1].include?(value.to_s.downcase)
+    end
+  end
+end

data/lib/jets/util/yamler.rb

@@ -1,16 +1,14 @@
 # Named Yamler to make it clear it's not the YAML class.
-class Jets::Util
+module Jets::Util
   class Yamler
     class << self
       def load(text)
-        options = { permitted_classes: [Date] }
-        options[:aliases] = true if RUBY_VERSION =~ /^3/ # Ruby 3.0.0 deprecates aliases: true
+        options = RUBY_VERSION.match?(/^3/) ? {aliases: true} : {} # Ruby 3.0.0 deprecates aliases: true
         YAML.load(text, **options)
       end
 
       def load_file(path)
-        options = { permitted_classes: [Date] }
-        options[:aliases] = true if RUBY_VERSION =~ /^3/ # Ruby 3.0.0 deprecates aliases: true
+        options = RUBY_VERSION.match?(/^3/) ? {aliases: true} : {} # Ruby 3.0.0 deprecates aliases: true
         YAML.load_file(path, **options)
       end
     end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "5.0.17"
+  VERSION = "6.0.0.beta1"
 end

data/lib/jets.rb

@@ -1,8 +1,6 @@
 $stdout.sync = true unless ENV["JETS_STDOUT_SYNC"] == "0"
 $:.unshift(File.expand_path("../", __FILE__))
 
-require "logger" # must require super early
-
 require "active_support"
 require "active_support/concern"
 require "active_support/core_ext"
@@ -11,21 +9,19 @@ require "active_support/ordered_hash"
 require "active_support/ordered_options"
 require "cfn_camelizer"
 require "cfn_status"
+require "cli-format"
 require "fileutils"
 require "json"
 require "memoist"
 require "rainbow/ext/string"
-require "jets-api"
-require "jets-git"
+
+CliFormat.default_format = "table"
 
 require "jets/core_ext"
 require "jets/autoloaders"
-loader = Jets::Autoloaders.for_gem
-loader.setup
+Jets::Autoloaders.gem.setup
 
 module Jets
   class Error < StandardError; end
   extend Core # root, logger, etc
 end
-
-loader.eager_load if Jets.eager_load_gem?