jets 4.0.8 → 5.0.0.beta1

data/lib/jets/{resource → cfn/resource}/sqs/queue.rb

@@ -1,6 +1,6 @@
 # CloudFormation SQS Queue docs: https://amzn.to/2MVWk0j
-module Jets::Resource::Sqs
-  class Queue < Jets::Resource::Base
+module Jets::Cfn::Resource::Sqs
+  class Queue < Jets::Cfn::Base
     def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
@@ -8,14 +8,14 @@ module Jets::Resource::Sqs
     def definition
       {
         queue_logical_id => {
-          type: "AWS::SQS::Queue",
-          properties: @props,
+          Type: "AWS::SQS::Queue",
+          Properties: @props,
         }
       }
     end
 
     def queue_logical_id
-      "{namespace}_sqs_queue"
+      "{namespace}SqsQueue"
     end
   end
 end

data/lib/jets/{resource → cfn/resource}/standardizer.rb

@@ -1,5 +1,7 @@
-class Jets::Resource
+class Jets::Cfn::Resource
   class Standardizer
+    include Jets::Util::Camelize
+
     attr_reader :definition
     def initialize(*definition)
       @definition = definition.flatten
@@ -9,30 +11,27 @@ class Jets::Resource
       camelize(standarize(@definition))
     end
 
-    def camelize(attributes)
-      Jets::Camelizer.transform(attributes)
-    end
-
     def standarize(definition)
+      definition = camelize(definition)
       first, second, third, _ = definition
       if definition.size == 1 && first.is_a?(Hash) # long form
         first # pass through
       elsif definition.size == 2 && second.is_a?(Hash) # medium form
         logical_id, attributes = first, second
-        attributes.delete(:properties) if attributes[:properties].nil? || attributes[:properties].empty?
+        attributes.delete(:Properties) if attributes[:Properties].nil? || attributes[:Properties].empty?
         { logical_id => attributes }
       elsif definition.size == 2 && second.is_a?(String) # short form
         logical_id, type = first, second
         { logical_id => {
-            type: type
+            Type: type
         }}
       elsif definition.size == 3 && (second.is_a?(String) || second.is_a?(NilClass))# short form
         logical_id, type, properties = first, second, third
         template = { logical_id => {
-                       type: type
+                       Type: type
                     }}
         attributes = template.values.first
-        attributes[:properties] = properties unless properties.empty?
+        attributes[:Properties] = properties unless properties.empty?
         template
       else # Dont understand this form
         raise "Invalid form provided. definition #{definition.inspect}"

data/lib/jets/cfn/resource.rb

@@ -0,0 +1,8 @@
+module Jets::Cfn
+  class Resource < Base
+    attr_reader :definition
+    def initialize(definition, replacements)
+      @definition, @replacements = definition, replacements
+    end
+  end
+end

data/lib/jets/cfn/ship.rb

@@ -16,6 +16,7 @@ module Jets::Cfn
 
       puts "Deploying CloudFormation stack with jets app!"
       begin
+        set_resource_tags
         save_stack
       rescue Aws::CloudFormation::Errors::InsufficientCapabilitiesException => e
         capabilities = e.message.match(/\[(.*)\]/)[1]
@@ -47,6 +48,20 @@ module Jets::Cfn
       clean_deploy_logs
       show_api_endpoint
       show_custom_domain
+      create_deployment_record
+    end
+
+    def create_deployment_record
+      return if @options[:stack_type] == :minimal
+      resp = Jets::Cfn::Deployment.new(@options.merge(stack_name: @parent_stack_name)).create
+      if resp
+        version = resp["version"]
+        Jets::Cfn::Upload.new.upload_cfn_templates(version) if version
+      end
+    end
+
+    def set_resource_tags
+      @tags = Jets.config.cfn.build.resource_tags.map { |key, value| { key: key, value: value } }
     end
 
     def save_stack
@@ -77,11 +92,12 @@ module Jets::Cfn
         stack_name: @parent_stack_name,
         capabilities: capabilities, # ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"]
         # disable_rollback: !@options[:rollback],
-      }.merge!(template.to_h)
+        tags: @tags,
+      }.merge!(template.stack_option)
     end
 
     def template
-      @template ||= TemplateSource.new(Jets::Names.parent_template_path, @options)
+      @template ||= Template.new(Jets::Names.parent_template_path, @options)
     end
 
     # check for /(_COMPLETE|_FAILED)$/ status
@@ -90,9 +106,7 @@ module Jets::Cfn
     end
 
     def save_apigw_state
-      state = Jets::Router::State.new
-      state.save("pages", Jets::Cfn::Builders::PageBuilder.pages)
-      state.save("routes", Jets::Router.routes)
+      Jets::Router::State.save_apigw_state
     end
 
     def prewarm
@@ -114,7 +128,7 @@ module Jets::Cfn
 
     def endpoint_unavailable?
       return true unless @options[:stack_type] == :full # s3 bucket is available
-      return true if Jets::Router.routes.empty?
+      return true if Jets::Router.no_routes?
       _, status = stack_status
       return true if status.include?("ROLLBACK")
       return true unless api_gateway
@@ -148,12 +162,12 @@ module Jets::Cfn
     def show_custom_domain
       return unless endpoint_available? && Jets.custom_domain? && Jets.config.domain.route53
 
-      domain_name = Jets::Resource::ApiGateway::DomainName.new
+      domain_name = Jets::Cfn::Resource::ApiGateway::DomainName.new
       # Looks funny but its right.
-      # domain_name is a method on the Jets::Resource::ApiGateway::Domain instance
+      # domain_name is a method on the Jets::Cfn::Resource::ApiGateway::Domain instance
       url = "https://#{domain_name.domain_name}"
       puts "Custom Domain: #{url}"
-      puts "App Domain: #{Jets.config.app.domain}" if Jets.config.app.domain
+      puts "App Domain: https://#{Jets.config.app.domain}" if Jets.config.app.domain
     end
 
     # All CloudFormation states listed here:
@@ -177,19 +191,12 @@ module Jets::Cfn
     end
 
     def capabilities
-      ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"] # TODO: remove capabilities hardcode
-      # return @options[:capabilities] if @options[:capabilities]
-      # if @options[:iam]
-      #   ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"]
-      # end
+      ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"]
     end
 
     # Upload both code and child templates to s3
     def upload_to_s3
-      raise "Did not specify @options[:s3_bucket] #{@options[:s3_bucket].inspect}" unless @options[:s3_bucket]
-
-      uploader = Upload.new(@options[:s3_bucket])
-      uploader.upload
+      Upload.new.upload
     end
   end
 end

data/lib/jets/cfn/template.rb

@@ -0,0 +1,89 @@
+module Jets::Cfn
+  class Template
+    include Jets::AwsServices
+
+    attr_reader :path
+
+    def initialize(path, options={})
+      @path = path
+      @options = options
+    end
+
+    def body
+      @body ||= IO.read(path)
+    end
+
+    def url
+      @url ||= upload_file_to_s3
+    end
+
+    def stack_option
+      if upload_to_s3?
+        from_s3
+      else
+        from_path
+      end
+    end
+
+  private
+    def upload_to_s3?
+      return false if @options[:stack_type] == :minimal # bucket not yet available
+      bucket_name.present?
+    end
+
+    def bucket_name
+      Jets.s3_bucket
+    end
+
+    def from_s3
+      {
+        template_url: url
+      }
+    end
+
+    def from_path
+      {
+        template_body: body
+      }
+    end
+
+    def upload_file_to_s3
+      obj = s3_resource.bucket(bucket_name).object(s3_key)
+      obj.upload_file(path)
+
+      "https://s3.amazonaws.com/#{bucket_name}/#{s3_key}"
+    end
+
+    def s3_key
+      @s3_key ||= "jets/cfn-templates/#{File.basename(path)}"
+    end
+
+    class << self
+      # Caches reduce filesystem IO calls
+      @@cache = {}
+      def load_file(path)
+        if @@cache[path]
+          @@cache[path]
+        else
+          @@cache[path] = Jets::Util::Yamler.load_file(path).deep_symbolize_keys
+        end
+      end
+
+      # Jets::Cfn::Template.lookup_logical_id(template_name, key)
+      # Jets::Cfn::Template.lookup_logical_id("api-resources", "UpApiResource")
+      def lookup_logical_id(template_name, key)
+        expr = "#{Jets::Names.templates_folder}/#{template_name}-*"
+        template_paths = Dir.glob(expr).sort.to_a
+        found_template = template_paths.detect do |path|
+          next unless File.file?(path)
+
+          template = Jets::Cfn::Template.load_file(path)
+          template[:Outputs].keys.include?(key.to_sym)
+        end
+
+        name = File.basename(found_template).sub(/\.yml$/,'')
+        name.underscore.camelize # IE: ApiResources1
+      end
+    end
+  end
+end

data/lib/jets/cfn/upload.rb

@@ -1,17 +1,11 @@
-require 'action_view'
+require 'active_support/number_helper'
 require 'digest'
 require 'rack/mime'
 
 module Jets::Cfn
   class Upload
     include Jets::AwsServices
-    include ActionView::Helpers::NumberHelper # number_to_human_size
-
-    attr_reader :bucket_name
-
-    def initialize(bucket_name)
-      @bucket_name = bucket_name
-    end
+    include ActiveSupport::NumberHelper # number_to_human_size
 
     def upload
       upload_cfn_templates
@@ -19,14 +13,25 @@ module Jets::Cfn
       upload_assets
     end
 
-    def upload_cfn_templates
-      puts "Uploading CloudFormation templates to S3."
-      expression = "#{Jets::Names.template_path_prefix}-*"
+    def bucket_name
+      Jets.s3_bucket
+    end
+
+    def upload_cfn_templates(version=nil)
+      puts "Uploading CloudFormation templates to S3." unless version # hide message when version is passed in
+      expression = "#{Jets::Names.templates_folder}/*"
+      if version # outside of each loop to avoid repeating
+        version = "versions/#{version}"
+      else
+        checksum = Jets::Builders::Md5.checksums["stage/code"]
+        version = "shas/#{checksum}"
+      end
+      checksum = Jets::Builders::Md5.checksums["stage/code"]
       Dir.glob(expression).each do |path|
         next unless File.file?(path)
-
-        key = "jets/cfn-templates/#{File.basename(path)}"
+        key = ["jets/cfn-templates", version, File.basename(path)].compact.join('/')
         obj = s3_resource.bucket(bucket_name).object(key)
+        puts "Uploading #{path} to s3://#{bucket_name}/#{key}".color(:green) if ENV['JETS_DEBUG']
         obj.upload_file(path)
       end
     end
@@ -60,17 +65,11 @@ module Jets::Cfn
 
     def upload_public_assets
       public_folders = %w[public]
-      public_folders = add_rack_assets(public_folders)
       public_folders.each do |folder|
         upload_asset_folder(folder)
       end
     end
 
-    def add_rack_assets(public_folders)
-      return public_folders unless Jets.rack?
-      public_folders + %w[rack/public]
-    end
-
     def upload_asset_folder(folder)
       expression = "#{Jets.root}/#{folder}/**/*"
       group_size = 10
@@ -88,12 +87,17 @@ module Jets::Cfn
     end
 
     def upload_to_s3(full_path)
-      return if identical_on_s3?(full_path) && !ENV['JETS_ASSET_UPLOAD_FORCE']
+      if identical_on_s3?(full_path) && !ENV['JETS_ASSET_UPLOAD_FORCE']
+        puts "Asset is identical on s3: #{full_path}" if ENV['JETS_DEBUG_ASSETS']
+        return
+      end
 
       key = s3_key(full_path)
       obj = s3_resource.bucket(bucket_name).object(key)
       content_type = content_type_headers(full_path)
-      Jets.logger.debug "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
+      if ENV['JETS_DEBUG_ASSETS']
+        puts "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
+      end
       obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type))
     end
 
@@ -152,6 +156,5 @@ module Jets::Cfn
         "#{minutes.to_i}m #{seconds.to_i}s"
       end
     end
-
   end
-end
+end

data/lib/jets/cli.rb

@@ -1,215 +1,33 @@
-require "thor"
-
-class Jets::CLI
-  def self.start(given_args=ARGV)
-    new(given_args).start
-  end
-
-  def self.thor_tasks
-    Jets::Commands::Base.namespaced_commands
-  end
-
-  def initialize(given_args=ARGV, **config)
-    @given_args = given_args.dup
-    @config = config
-  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
-      command_class.perform(full_command, thor_args)
-    else
-      main_help
-    end
-  end
-
-  # 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.
-  #
-  # 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
-    unless %w[new help].include?(command)
-      Jets::Turbo.new.charge # handles Afterburner mode
-      Jets.boot
-    end
-  end
-
-  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!
-    # 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 console c].include?(command)
-    env = nil if env&.starts_with?('-')
-    return unless env
-    ENV['JETS_ENV'] = env ? env : 'development'
-  end
-
-  # thor_args normalized the args Array to work with our Thor command
-  # subclasses.
-  # 1. The namespace is stripe
-  # 2. Help is shifted in front if a help flag is detected
-  def thor_args
-    args = @given_args.clone
-
-    # jets generate is a special command requires doesn't puts out the help menu automatically when
-    # `jets generate` is called without additional args.  We'll take it over early and fix it here.
-    generate = full_command == "generate"
-
-    if generate && ((args.size == 1 || help_flags.include?(args.last)) || args.size == 2)
-      puts Jets::Generator.help
-      exit
-    end
-
-    help_args = args & help_flags
-    unless help_args.empty?
-      # Allow using help flags at the end of the command to trigger help menu
-      args -= help_flags # remove "help" and help flags from args
-      args[0] = meth # first command will always be the meth now since
-        # we removed the help flags
-      args.unshift("help")
-      args.compact!
-      return args
-    end
-
-    # reassigns the command without the namespace if reached here
-    args[0] = meth
-    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",
-    "s"  => "server",
-    "db" => "dbconsole",
-  }
-  def full_command
-    # Removes any args that starts with -, those are option args.
-    # Also remove "help" flag.
-    args = @given_args.reject {|o| o =~ /^-/ } - help_flags
-    command = args[0] # first argument should always be the command
-    command = ALIASES[command] || command
-    Jets::Commands::Base.autocomplete(command)
-  end
-
-  # 1. look up Thor tasks
-  # 2. look up Rake tasks
-  # 3. help menu with all commands when both Thor and Rake tasks are not found
-  def lookup(full_command)
-    thor_task_found = Jets::Commands::Base.namespaced_commands.include?(full_command)
-    if thor_task_found
-      return Jets::Commands::Base.klass_from_namespace(namespace)
-    end
-
-    return unless jets_project?
-
-    Jets::Commands::RakeCommand if rake_task_found
-  end
-
-  def rake_task_found
-    return false unless full_command # can be nil for subcommands and would break jets help without this check
-    bracket_regex = /\[.*/ # matches everything after the first [
-    command = full_command.sub(bracket_regex, '') # remove everything after the first [
-    namespaced_commands = Jets::Commands::RakeCommand.namespaced_commands.map {|x| x.sub(bracket_regex, '') }
-    namespaced_commands.include?(command)
-  end
-
-  def jets_project?
-    File.exist?("config/application.rb")
-  end
-
-  # ["-h", "-?", "--help", "-D", "help"]
-  def help_flags
-    Thor::HELP_MAPPINGS + ["help"]
-  end
-
-  def namespace
-    return nil unless full_command
-
-    if full_command.include?(':')
-      words = full_command.split(':')
-      words.pop
-      words.join(':')
-    end
-  end
-
-  def main_help
-    shell = Thor::Shell::Basic.new
-    shell.say "Commands:"
-    shell.print_table(thor_list, :indent => 2, :truncate => true)
-
-    if jets_project? && !rake_list.empty?
-      shell.say "\nCommands via rake:"
-      shell.print_table(rake_list, :indent => 2, :truncate => true)
-    end
-
-    shell.say "\n"
-    shell.say main_help_body
-  end
-
-  def thor_list
-    Jets::Commands::Base.help_list(show_all_tasks)
-  end
-
-  def rake_list
-    list = Jets::Commands::RakeCommand.formatted_rake_tasks(show_all_tasks)
-    list.map do |array|
-      array[0] = "jets #{array[0]}"
-      array
-    end
-  end
-
-  def show_all_tasks
-    @given_args.include?("--all") || @given_args.include?("-A")
-  end
+# frozen_string_literal: true
+
+require "jets/app_loader"
+
+# If we are inside a Jets application this method performs an exec and thus
+# the rest of this script is not run.
+# exec_app either runs bin/jets or an inline version of it.
+Jets::AppLoader.exec_app
+
+# Allow running jets with local source code when bin/jets does not exist
+# Useful for development: jets build
+# Also allows jets to work without a bin/jets file in the project.
+if File.exist?("config/application.rb")
+  APP_PATH = File.expand_path("config/application", Dir.pwd)
+  require "jets"
+  require "jets/commands"
+  return
+end
 
-  def main_help_body
-    <<-EOL
-Add -h to any of the commands for more help.  Examples:
+# The rest of the script runs if outside of Jets application. IE:
+# jets new demo
 
-  jets call -h
-  jets routes -h
-  jets deploy -h
-  jets status -h
-  jets dynamodb:create -h
-  jets db:create -h
+require "jets/ruby_version_check"
+Signal.trap("INT") { puts; exit(1) }
 
-EOL
-  end
+require "jets/command"
 
+if ARGV.first == "plugin"
+  ARGV.shift
+  Jets::Command.invoke :plugin, ARGV
+else
+  Jets::Command.invoke :application, ARGV
 end

data/lib/jets/command/actions.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Jets
+  module Command
+    module Actions
+      # Change to the application's path if there is no <tt>config.ru</tt> file in current directory.
+      # This allows us to run <tt>jets server</tt> from other directories, but still get
+      # the main <tt>config.ru</tt> and properly set the <tt>tmp</tt> directory.
+      def set_application_directory!
+        Dir.chdir(File.expand_path("../..", APP_PATH)) unless File.exist?(File.expand_path("config.ru"))
+      end
+
+      def require_application_and_environment!
+        Jets.boot
+      end
+
+      def require_application!
+        require ENGINE_PATH if defined?(ENGINE_PATH)
+
+        if defined?(APP_PATH)
+          require APP_PATH
+        end
+      end
+
+      if defined?(ENGINE_PATH)
+        def load_tasks
+          Rake.application.init("jets")
+          Rake.application.load_rakefile
+        end
+
+        def load_generators
+          engine = ::Jets::Engine.find(ENGINE_ROOT)
+          Jets::Generators.namespace = engine.railtie_namespace
+          engine.load_generators
+        end
+      else
+        def load_tasks
+          Jets.boot # hack
+          Jets.application.load_tasks
+        end
+
+        def load_generators
+          Jets.application.load_generators
+        end
+      end
+    end
+  end
+end
+