jets 5.0.17 → 6.0.0.beta1

data/lib/jets/shim/response/lambda.rb

@@ -0,0 +1,4 @@
+module Jets::Shim::Response
+  class Lambda < Base
+  end
+end

data/lib/jets/shim/response/web.rb

@@ -0,0 +1,4 @@
+module Jets::Shim::Response
+  class Web < Base
+  end
+end

data/lib/jets/shim.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Jets
+  module Shim
+    extend Memoist
+
+    def handler(event, context, route = nil)
+      Handler.new(event, context, route).handle
+    end
+
+    def to_rack_env(event, context)
+      Handler.new(event, context).to_rack_env
+    end
+
+    def boot
+      # Don't boot Jets in maintenance mode. Makes cold start much faster.
+      return if Maintenance.enabled?
+
+      paths = %w[
+        config/jets/shim.rb
+      ]
+      paths.map! do |path|
+        path.starts_with?(".") ? path : "./#{path}"
+      end
+      found = paths.find { |p| File.exist?(p) }
+      if found
+        require found # calls Jets.shim.configure
+      else
+        config.rack_app # all settings are inferred
+      end
+
+      # Boot Jets to add additional features
+      Jets.boot
+    end
+
+    def configure
+      yield config
+    end
+
+    def config
+      Config.instance
+    end
+
+    extend self
+  end
+end

data/lib/jets/stack/{main/dsl → dsl/main}/base.rb

@@ -1,7 +1,6 @@
-module Jets::Stack::Main::Dsl
+module Jets::Stack::Dsl::Main
   module Base
     def ref(value)
-      "!Ref #{value.to_s.camelize}"
     end
 
     # Examples:
@@ -9,30 +8,12 @@ module Jets::Stack::Main::Dsl
     #   get_attr("logical_id", "attribute")
     #   get_attr(["logical_id", "attribute"])
     def get_att(*item)
-      item = item.flatten
-      options = item.last.is_a?(Hash) ? item.pop : {}
-
-      # list is an Array
-      list = if item.size == 1
-                item.first.split('.')
-              else
-                item
-              end
-      list.map! { |s| s.to_s.camelize } unless options[:autoformat] == false
-      { "Fn::GetAtt" => list }
     end
 
     def logical_id(value)
-      value.to_s.camelize
     end
 
     def depends_on(*stacks)
-      if stacks == []
-        @depends_on
-      else
-        @depends_on ||= []
-        @depends_on += stacks
-      end
     end
 
     # Due to `if Jets::Stack.has_resources?` check early on in the bootstraping process
@@ -40,7 +21,6 @@ module Jets::Stack::Main::Dsl
     # the placeholder as part of the cfn template build process after the code has been built
     # and the code_s3_key with md5 is available.
     def code_s3_key
-      "code_s3_key_placeholder"
     end
 
     # resource(:hello,
@@ -57,7 +37,6 @@ module Jets::Stack::Main::Dsl
     #   timeout: 20,
     # )
     def handler(name)
-      "handlers/shared/functions/#{name}" # generated handler
     end
   end
-end
+end

data/lib/jets/stack/dsl/main/cloudwatch.rb

@@ -0,0 +1,6 @@
+module Jets::Stack::Dsl::Main
+  module Cloudwatch
+    def cloudwatch_alarm(id, hash = {})
+    end
+  end
+end

data/lib/jets/stack/dsl/main/iam.rb

@@ -0,0 +1,6 @@
+module Jets::Stack::Dsl::Main
+  module Iam
+    def iam_role(id, props = {})
+    end
+  end
+end

data/lib/jets/stack/dsl/main/kinesis.rb

@@ -0,0 +1,6 @@
+module Jets::Stack::Dsl::Main
+  module Kinesis
+    def kinesis_stream(id, props = {})
+    end
+  end
+end

data/lib/jets/stack/dsl/main/lambda.rb

@@ -0,0 +1,39 @@
+module Jets::Stack::Dsl::Main
+  module Lambda
+    # Example:
+    #
+    #   function(:hello,
+    #     handler: handler("hello.lambda_hander"),
+    #     runtime: "python3.6"
+    #   )
+    #
+    # Defaults to ruby. So:
+    #
+    #   function(:hello)
+    #
+    # is the same as:
+    #
+    #   function(:hello,
+    #     handler: handler("hello.hande"),
+    #     runtime: :ruby
+    #   )
+    #
+    def function(id, props = {})
+    end
+    alias_method :ruby_function, :function
+    alias_method :lambda_function, :function
+
+    def python_function(id, props = {})
+    end
+
+    def node_function(id, props = {})
+    end
+
+    # Usage:
+    #
+    #   permission(:my_permission, principal: "events.amazonaws.com")
+    #
+    def permission(id, props = {})
+    end
+  end
+end

data/lib/jets/stack/dsl/main/s3.rb

@@ -0,0 +1,9 @@
+module Jets::Stack::Dsl::Main
+  module S3
+    def s3_bucket(id, props = {})
+    end
+
+    def s3_bucket_configuration(id, props = {})
+    end
+  end
+end

data/lib/jets/stack/dsl/main/sns.rb

@@ -0,0 +1,12 @@
+module Jets::Stack::Dsl::Main
+  module Sns
+    def sns_topic(id, props = {})
+    end
+
+    def sns_topic_policy(id, props = {})
+    end
+
+    def sns_subscription(id, props = {})
+    end
+  end
+end

data/lib/jets/stack/dsl/main/sqs.rb

@@ -0,0 +1,6 @@
+module Jets::Stack::Dsl::Main
+  module Sqs
+    def sqs_queue(id, props = {})
+    end
+  end
+end

data/lib/jets/stack/dsl/main.rb

@@ -0,0 +1,15 @@
+module Jets::Stack::Dsl
+  module Main
+    extend ActiveSupport::Concern
+
+    class_methods do
+      include Base
+      include Cloudwatch
+      include Iam
+      include Lambda
+      include S3
+      include Sns
+      include Sqs
+    end
+  end
+end

data/lib/jets/stack/dsl/output.rb

@@ -0,0 +1,11 @@
+module Jets::Stack::Dsl
+  module Output
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def output(*definition)
+        {}
+      end
+    end
+  end
+end

data/lib/jets/stack/dsl/parameter.rb

@@ -0,0 +1,11 @@
+module Jets::Stack::Dsl
+  module Parameter
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def parameter(*definition)
+        {}
+      end
+    end
+  end
+end

data/lib/jets/stack/dsl/resource.rb

@@ -0,0 +1,11 @@
+module Jets::Stack::Dsl
+  module Resource
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def resource(*definition)
+        {}
+      end
+    end
+  end
+end

data/lib/jets/stack/dsl.rb

@@ -0,0 +1,10 @@
+class Jets::Stack
+  module Dsl
+    extend ActiveSupport::Concern
+
+    include Main
+    include Output
+    include Parameter
+    include Resource
+  end
+end

data/lib/jets/stack/{output/lookup.rb → outputs.rb}

@@ -1,5 +1,5 @@
-class Jets::Stack::Output
-  class Lookup
+class Jets::Stack
+  class Outputs
     include Jets::AwsServices
 
     def initialize(stack_subclass)
@@ -7,8 +7,9 @@ class Jets::Stack::Output
     end
 
     @@cache = {}
-    def output(logical_id)
-      cache_key = "#{@stack_subclass}-#{logical_id}"
+    def value(logical_id)
+      logical_id = logical_id.to_s.camelize
+      cache_key = "#{@stack_subclass}:#{logical_id}"
       return @@cache[cache_key] if @@cache[cache_key]
 
       child_stack_id = @stack_subclass.to_s.camelize
@@ -23,7 +24,7 @@ class Jets::Stack::Output
 
     # Shared child stack arn
     def shared_stack_arn(logical_id)
-      parent_stack = Jets.project_namespace
+      parent_stack = Jets.project.namespace
       resp = cfn.describe_stacks(stack_name: parent_stack)
       parent = resp.stacks.first
       output_value(parent, logical_id)
@@ -37,4 +38,4 @@ class Jets::Stack::Output
       output&.output_value
     end
   end
-end
+end

data/lib/jets/stack.rb

@@ -1,9 +1,6 @@
 module Jets
   class Stack
-    include Main::Dsl
-    include Parameter::Dsl
-    include Output::Dsl
-    include Resource::Dsl
+    include Dsl
 
     class << self
       extend Memoist
@@ -15,65 +12,21 @@ module Jets
 
       def inherited(base)
         super
-        self.subclasses << base if base.name
+        subclasses << base if base.name
       end
 
-      # klass = Jets::Stack.new_class("Bucket3")
-      def new_class(class_name, &block)
-        # https://stackoverflow.com/questions/4113479/dynamic-class-definition-with-a-class-name
-        # Defining the constant this way gets around: SyntaxError: dynamic constant assignment error
-        klass = Class.new(Jets::Stack) # First klass is an anonymous class. IE: class.name is nil
-        klass = Object.const_set(class_name, klass) # now klass is a named class
-        Jets::Stack.subclasses << klass # mimic inherited hook because
-
-        # Must run class_eval after adding to subclasses in order for the resource declarations in the
-        # so that the resources get registered to the right subclass.
-        klass.class_eval(&block)
-        klass # return klass
-      end
-
-      # Build it to figure out if we need to build the stack for the SharedBuilder
-      def build?
-        empty = template == {"Parameters"=>{"IamRole"=>{"Type"=>"String"}, "S3Bucket"=>{"Type"=>"String"}}}
-        !empty
-      end
-
-      def functions
-        stack = new
-        # All the & because resources might be nil
-        templates = stack.resources&.map(&:template)&.select do |t|
-          attributes = t.values.first
-          attributes[:Type] == 'AWS::Lambda::Function'
-        end
-        templates ||= []
-        templates.map { |t| Function.new(t) }
-      end
-
-      def template
-        # Pretty funny looking, creating an instance of stack to be passed to the Builder.
-        # Another way of looking at it:
-        #
-        #   stack = new # MyStack.new
-        #   builder = Jets::Stack::Builder.new(stack)
-        #
-        builder = Jets::Stack::Builder.new(new)
-        builder.template
-      end
-      memoize :template
-
-      def lookup(logical_id)
-        looker.output(logical_id)
-      end
-
-      def looker
-        Jets::Stack::Output::Lookup.new(self)
+      # Do not name this output, it'll collide with the output DSL method
+      def output_value(logical_id)
+        puts "lookup logical_id: #{logical_id}"
+        outputs.value(logical_id)
       end
-      memoize :looker
+      # Keep lookup for backwards compatibility
+      alias_method :lookup, :output_value
 
-      def output_keys
-        outputs = new.outputs || []
-        outputs.map(&:template).map {|o| o.keys.first}
+      def outputs
+        Outputs.new(self)
       end
+      memoize :outputs
     end
   end
 end

data/lib/jets/thor/auth.rb

@@ -0,0 +1,96 @@
+module Jets::Thor
+  class Auth
+    def initialize(args)
+      @args = args
+    end
+
+    # Only check once. Thor subcommands result in 2 calls to Thor dispatch.
+    @@success = false
+    def check!
+      return @@success if @@success
+      # Commands that do not require authentication
+      return if no_auth_command?
+
+      if api_key?
+        resp = ping
+        puts resp["message"] unless resp["message"] == "pong"
+        @@success = true
+      else
+        login_help_message
+        exit 1
+      end
+    end
+
+    # interface method
+    def api_key?
+      Jets::Api::Config.instance.api_key?
+    end
+
+    # interface method
+    def ping
+      Jets::Api::Ping.create
+    end
+
+    # Tricky: Thor load the command and then the subcommand.
+    # IE: jets generate:event
+    #     @args = ["dotenv", "list"] # first pass
+    #     @args = ["list"]           # second pass
+    # We only check first pass to see if it is a no_auth_command.
+    # And cache it so the second pass never occurs.
+    @@no_auth_command = nil
+    def no_auth_command?
+      return @@no_auth_command unless @@no_auth_command.nil?
+      base = %w[
+        generate
+        init
+      ]
+      more = %w[
+        ci:info
+        ci:init
+        ci:logs
+        ci:start
+        ci:status
+        ci:stop
+        clean
+        concurrency
+        curl
+        dotenv
+        env
+        exec
+        functions
+        funs
+        logs
+        maintenance
+        schedule
+        waf:info
+        waf:init
+      ]
+      commands = base + more
+      commands += ProjectCheck.new(@args).no_project_commands
+      commands.uniq!
+      # @args contains the command and subcommand
+      # IE: jets ci:init => ["ci", "init"]
+
+      @@no_auth_command = (commands & @args).any? ||  # IE: ["ci"] & ["ci", "init"]
+        (commands & [@args.join(":")]).any? ||        # IE: ["ci:init"] & ["ci:init"]
+        @args.empty?
+    end
+
+    def login_help_message
+      puts <<~EOL
+        An account is required to use Jets.
+        You can sign up at https://www.rubyonjets.com
+
+        Please login. You can login with
+
+            jets login
+
+      EOL
+    end
+
+    def handle_unauthorized(e)
+      puts "Unauthorized: #{e.message}".color(:red)
+      exit 1
+    end
+  end
+end

data/lib/jets/thor/base.rb

@@ -0,0 +1,155 @@
+require "thor"
+require "tty-screen"
+
+module Thor::StartOverride
+  class << self
+    def included(base)
+      super
+      base.extend ClassMethods
+    end
+  end
+
+  module ClassMethods
+    def start(given_args = ARGV, config = {})
+      # Trap ^C
+      Signal.trap("INT") {
+        puts "\nCtrl-C detected. Exiting..."
+        sleep 0.1
+        exit
+      }
+
+      # Namespace subcommands separate by colon instead of space
+      if given_args && given_args[0]&.include?(":")
+        commands = given_args.shift.split(":")
+        given_args.unshift(commands)
+        given_args.flatten!
+      end
+
+      super
+    end
+  end
+end
+Thor.include Thor::StartOverride
+
+module Thor::CreateCommandOverride
+  def create_command(meth) # :nodoc:
+    @long_desc ||= long_desc_from_help_file(self, meth)
+    super
+  end
+
+  # So we don't have to duplicate the long_desc Thor CLI classes
+  def long_desc_from_help_file(klass, meth)
+    folder = klass.name.demodulize.underscore unless klass == Jets::CLI
+    path = ["../cli/help", folder, "#{meth}.md"].compact.join("/")
+    path = File.expand_path(path, __dir__)
+    if File.exist?(path)
+      IO.read(path)
+    end
+  end
+end
+
+class Thor
+  class << self
+    prepend Thor::CreateCommandOverride
+  end
+end
+
+module Thor::FormattedUsageOverride
+  def formatted_usage(klass, namespace = true, subcommand = false)
+    usage = super
+    # Namespace subcommands separate by colon instead of space
+    items = formatted_usage_by_colons(usage)
+  end
+
+  def formatted_usage_by_colons(input)
+    words = input.split(/\s+/)
+
+    formatted = words.map.with_index do |word, index|
+      next_word = words[index + 1]
+      if next_word.nil? || next_word == next_word.upcase
+        "#{word} "
+      else
+        "#{word}:"
+      end
+    end
+
+    formatted.join.gsub(": ", ":").strip
+  end
+end
+Thor::Command.prepend Thor::FormattedUsageOverride
+
+# Override thor's long_desc identation behavior
+# https://github.com/erikhuda/thor/issues/398
+class Thor
+  module Shell
+    class Basic
+      def print_wrapped(message, options = {})
+        message = "\n#{message}" unless message[0] == "\n"
+        stdout.puts message
+      end
+    end
+  end
+end
+
+module Jets::Thor
+  class Base < Thor
+    include SharedOptions
+    include Help
+
+    class << self
+      def dispatch(m, args, options, config)
+        # Allow calling for help via:
+        #   jets command help
+        #   jets command -h
+        #   jets command --help
+        #
+        # as well thor's normal way:
+        #
+        #   jets help command
+        if args.length > 1 && !(args & help_flags).empty?
+          args -= help_flags
+          args.insert(-2, "help")
+        end
+
+        if args.length == 1 && !(args & version_flags).empty?
+          args = ["version"]
+        end
+
+        VersionCheck.new.check!
+        ProjectCheck.new(args).check!
+        auth = Jets::Thor::Auth.new(args)
+        auth.check!
+        super
+      rescue Jets::Api::Error::Unauthorized => e
+        auth.handle_unauthorized(e)
+      rescue ProjectCheck::NotProjectError
+        puts "Not a Jets project. Please run this command from a Jets project folder.".color(:red)
+      end
+
+      # Also used by Jets::Thor::Auth
+      def help_flags
+        Thor::HELP_MAPPINGS + ["help"]
+      end
+
+      # Also used by Jets::Thor::Auth
+      #   jets version
+      #   jets --version
+      #   jets -v
+      def version_flags
+        ["--version", "-v"]
+      end
+
+      # meant to be overriden
+      def website
+        ""
+      end
+
+      # https://github.com/erikhuda/thor/issues/244
+      # Deprecation warning: Thor exit with status 0 on errors. To keep this behavior, you must define `exit_on_failure?` in `Lono::Commands`
+      # You can silence deprecations warning by setting the environment variable THOR_SILENCE_DEPRECATION.
+      def exit_on_failure?
+        true
+      end
+    end
+  end
+end