jets 0.8.18 → 0.9.0

data/lib/jets/commands/console.rb

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

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

@@ -0,0 +1,17 @@
+## Examples
+
+    $ jets runner 'puts "hi"'
+    hi
+    $ jets runner 'puts Jets.env'
+    development
+
+Using a script in a file.  Let's say you have a script:
+
+script.rb:
+
+```ruby
+puts "hello world: #{Jets.env}"
+```
+
+    $ jets runner file://script.rb
+    hello world: development

data/lib/jets/commands/main.rb

@@ -8,6 +8,7 @@ module Jets::Commands
     desc "build", "Builds and packages project for AWS Lambda"
     long_desc Help.text(:build)
     option :templates_only, type: :boolean, default: false, desc: "provide a way to skip building the code and only build the CloudFormation templates"
+    option :full, type: :boolean, default: false, desc: "For a fake full build even if the stack does not exist"
     def build
       Build.new(options).run
     end
@@ -56,6 +57,12 @@ module Jets::Commands
       Console.run
     end
 
+    desc "runner", "Run Ruby code in the context of Jets app non-interactively"
+    long_desc Help.text(:runner)
+    def runner(code)
+      Runner.run(code)
+    end
+
     desc "dbconsole", "Starts DB REPL console"
     long_desc Help.text(:dbconsole)
     def dbconsole

data/lib/jets/commands/new.rb

@@ -1,5 +1,6 @@
 module Jets::Commands
   class New < Sequence
+    VALID_MODES = %w[html api job]
     argument :project_name
 
     # Ugly, but when the class_option is only defined in the Thor::Group class
@@ -7,29 +8,33 @@ module Jets::Commands
     # If anyone knows how to fix this let me know.
     def self.cli_options
       [
-        [:api, type: :boolean, default: false, desc: "API mode."],
-        [:database, type: :boolean, default: true, desc: "Adds database"],
         [:bootstrap, type: :boolean, default: true, desc: "Install bootstrap css"], # same option in WebpackerTemplate
+        [:database, type: :boolean, default: true, desc: "Adds database"],
         [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files."],
         [:git, type: :boolean, default: true, desc: "Git initialize the project"],
+        [:mode, default: 'html', desc: "mode: #{VALID_MODES.join(',')}"],
         [:repo, desc: "GitHub repo to use. Format: user/repo"],
         [:webpacker, type: :boolean, default: true, desc: "Install webpacker"],
       ]
     end
 
     cli_options.each do |args|
-      class_option *args
+      class_option(*args)
     end
 
     def set_api_mode
       # options is a frozen hash by Thor so cannot modify it.
       # Also had trouble unfreezing it with .dup. So using instance variables instead
-      if options[:api]
+      case options[:mode]
+      when 'html'
+        @webpacker = options[:webpacker]
+        @bootstrap = options[:bootstrap]
+      when 'api', 'job'
         @webpacker = false
         @bootstrap = false
       else
-        @webpacker = options[:webpacker]
-        @bootstrap = options[:bootstrap]
+        puts "Invalid mode provided: #{@options[:mode].colorize(:red)}. Please pass in an valid mode: #{VALID_MODES.join(',').colorize(:green)}."
+        exit 1
       end
     end
 
@@ -90,22 +95,37 @@ JS
     end
 
     def user_message
-      puts <<-EOL
-#{"="*64}
-Congrats 🎉 You have successfully created a Jets project.
-
-Cd into the project directory:
-  cd #{project_name}
+      more_info = if options[:mode] == 'job'
+        <<~EOL
+          Learn more about jobs here: http://rubyonjets.com/docs/jobs/
 
-To start a server and test locally:
-  jets server # localhost:8888 should have the Jets welcome page
+          To deploy to AWS Lambda:
+            jets deploy
+        EOL
+      else
+        <<~EOL
+          To start a server and test locally:
+            jets server # localhost:8888 should have the Jets welcome page
+
+          Scaffold example:
+            jets generate scaffold Post title:string body:text published:boolean
+
+          To deploy to AWS Lambda, edit your .env.development.remote and add a DATABASE_URL endpoint.
+          Then run:
+        
+            jets deploy
+        EOL
+      end
+      
+      puts <<~EOL
+        #{"="*64}
+        Congrats 🎉 You have successfully created a Jets project.
 
-Scaffold example:
-  jets generate scaffold Post title:string body:text published:boolean
+        Cd into the project directory:
+          cd #{project_name}
 
-To deploy to AWS Lambda:
-  jets deploy
-EOL
+        #{more_info}
+      EOL
     end
   end
 end

data/lib/jets/commands/runner.rb

@@ -0,0 +1,18 @@
+class Jets::Commands::Runner
+  def self.run(code)
+    Jets.eager_load!
+
+    if code =~ %r{^file://}
+      path = code.sub('file://', '')
+      full_path = "#{Jets.root}#{path}"
+      if File.exist?(full_path)
+        code = IO.read(full_path)
+      else
+        puts "ERROR: file not found at #{full_path}".colorize(:red)
+        exit 1
+      end
+    end
+
+    eval(code) # inline script
+  end
+end

data/lib/jets/commands/sequence.rb

@@ -35,7 +35,33 @@ private
 
   def copy_project
     puts "Creating new project called #{project_name}."
-    directory ".", project_name
+    directory ".", project_name, copy_options
+  end
+
+  def copy_options
+    # list of words to include in the exclude pattern and will not be generated
+    words = %w[
+      Procfile
+      controllers
+      helpers
+      javascript
+      models/application_
+      views
+      config.ru
+      database.yml
+      dynamodb.yml
+      routes
+      db/
+      spec
+      yarn
+      public
+    ]
+
+    if @options[:mode] == 'job'
+      { exclude_pattern: Regexp.new(words.join('|')) }
+    else
+      {}
+    end
   end
 
   def git_installed?

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

@@ -0,0 +1,3 @@
+--color
+--format documentation
+--require spec_helper

data/lib/jets/commands/templates/skeleton/Gemfile.tt

@@ -10,7 +10,6 @@ gem "webpacker", git: "https://github.com/tongueroo/webpacker.git", branch: "jet
 # Include pg gem if you are using ActiveRecord, remove if you are not
 gem "pg", "~> 0.21"
 <% end %>
-gem "mimemagic"
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

data/lib/jets/commands/templates/skeleton/app/jobs/application_job.rb

@@ -1,2 +1,4 @@
 class ApplicationJob < Jets::Job::Base
+  # Adjust to increase the default timeout for all Job classes
+  class_timeout 30
 end

data/lib/jets/commands/templates/skeleton/config/application.rb.tt

@@ -1,6 +1,7 @@
 Jets.application.configure do
   config.project_name = "<%= project_name %>"
-  config.api_generator = <%= !!@options[:api] %>
+  config.api_generator = <%= @options[:mode] == 'api' %> # deprecated
+  config.api_mode = <%= @options[:mode] == 'api' %>
 
   # config.prewarm.enable = true # default is true
   # config.prewarm.rate = '30 minutes' # default is '30 minutes'

data/lib/jets/commands/templates/skeleton/config/routes.rb

@@ -1,5 +1,9 @@
 Jets.application.routes.draw do
-  # Default homepage. This should be replaced.
+  # Default homepage. This should be replaced. Replacing requires using JETS_ENV_EXTRA
+  # or deleting and deploying twice.
+  # More info:
+  #   http://rubyonjets.com/docs/routes-workaround/
+  #   http://rubyonjets.com/docs/env-extra/
   root "jets/welcome#index"
 
   # Required for API Gateway to serve static utf8 content out of public folder.

data/lib/jets/commands/templates/skeleton/spec/spec_helper.rb.tt

@@ -1,12 +1,13 @@
-ENV["JETS_ENV"] ||= "test"
 ENV["TEST"] = "1"
-abort("The Jets environment is running in production mode!") if Jets::Config.env == "production"
+ENV["JETS_ENV"] ||= "test"
+# Ensures aws api never called. Fixture home folder does not contain ~/.aws/credentails
+ENV['HOME'] = "spec/fixtures/home"
 
-require "pp"
 require "byebug"
 require "fileutils"
-
 require "jets"
+
+abort("The Jets environment is running in production mode!") if Jets.env == "production"
 Jets.boot
 
 <% if @webpacker -%>

data/lib/jets/core.rb

@@ -90,7 +90,6 @@ module Jets::Core
   def eager_load_jets
     lib_jets = File.expand_path(".", File.dirname(__FILE__))
     Dir.glob("#{lib_jets}/**/*.rb").select do |path|
-      # puts "path #{path}"
       next if !File.file?(path)
       next if skip_eager_load_paths?(path)
 
@@ -115,7 +114,8 @@ module Jets::Core
     path =~ %r{/internal/app} ||
     path =~ %r{/webpacker} ||
     path =~ %r{/cli} ||
-    path =~ %r{/core_ext}
+    path =~ %r{/core_ext} ||
+    path =~ %r{/jets/stack}
   end
 
   def class_mappings(class_name)
@@ -129,13 +129,15 @@ module Jets::Core
   def eager_load_app
     Dir.glob("#{Jets.root}app/**/*.rb").select do |path|
       next if !File.file?(path) or path =~ %r{/javascript/} or path =~ %r{/views/}
+      next if path.include?('app/shared/functions')
 
       class_name = path
                     .sub(/\.rb$/,'') # remove .rb
-                    .sub(/^\.\//,'') # remove ./
-                    .sub(/app\/\w+\//,'') # remove app/controllers or app/jobs etc
-                    .classify
-      # puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['JETS_DEBUG']
+                    .sub(%{^\./},'') # remove ./
+                    .sub(Jets.root.to_s,'')
+                    .sub(%r{app/shared/\w+/},'') # remove shared/resources or shared/extensions
+                    .sub(%r{app/\w+/},'') # remove app/controllers or app/jobs etc
+      class_name = class_name.classify
       class_name.constantize # use constantize instead of require so dont have to worry about order.
     end
   end

data/lib/jets/default/application.rb

@@ -9,6 +9,7 @@ Jets.application.configure do
                             app/jobs
                             app/rules
                             app/helpers
+                            app/shared/resources
                           ]
   config.extra_autoload_paths = []
 

data/lib/jets/generator.rb

@@ -27,7 +27,7 @@ class Jets::Generator
     g.stylesheets     false
     g.javascripts     false
     g.assets          false
-    g.api             Jets.config.api_generator
+    g.api             Jets.config.api_mode
     g.resource_route  true
     g.templates.unshift(template_paths)
     g

data/lib/jets/inflections.rb

@@ -0,0 +1,23 @@
+module Jets
+  class Inflections
+    class << self
+      def load!
+        ActiveSupport::Inflector.inflections(:en) do |inflect|
+          base_inflections.each do |k,v|
+            inflect.irregular k,v
+          end
+          # Users can add custom inflections
+          Jets.config.inflections.irregular.each do |k,v|
+            inflect.irregular k,v
+          end
+        end
+      end
+
+      def base_inflections
+        {
+          sns: 'sns'
+        }
+      end
+    end
+  end
+end

data/lib/jets/job/dsl.rb

@@ -3,7 +3,9 @@
 # So the Jets::Job::Dsl overrides some of the Jets::Lambda::Functions behavior.
 #
 # Implements:
-#   default_associated_resource: must return @resources
+#
+#   default_associated_resource_definition
+#
 module Jets::Job::Dsl
   extend ActiveSupport::Concern
 
@@ -11,75 +13,95 @@ module Jets::Job::Dsl
     class << self
       # Public: Creates CloudWatch Event Rule
       #
-      # expression - The rate expression. 
+      # expression - The rate expression.
       #
       # Examples
       #
       #   rate("10 minutes")
       #   rate("10 minutes", description: "Hard job")
       #
-      def rate(expression)
-        update_properties(schedule_expression: "rate(#{expression})")
+      def rate(expression, props={})
+        schedule_job("rate(#{expression})", props)
       end
 
-      def cron(expression)
-        update_properties(schedule_expression: "cron(#{expression})")
+      # Public: Creates CloudWatch Event Rule
+      #
+      # expression - The cron expression.
+      #
+      # Examples
+      #
+      #   cron("0 */12 * * ? *")
+      #   cron("0 */12 * * ? *", description: "Hard job")
+      #
+      def cron(expression, props={})
+        schedule_job("cron(#{expression})", props)
       end
 
-      def event_pattern(details={})
-        event_rule(event_pattern: details)
+      def schedule_job(expression, props={})
+        @associated_properties = nil # dont use any current associated_properties
+        props = props.merge(schedule_expression: expression)
+        associated_properties(props)
+        # Eager define resource
+        resource(events_rule_definition) # add associated resources immediately
+        @associated_properties = nil # reset for next definition, since we're defining eagerly
+      end
+
+      def event_pattern(details={}, props={})
+        @associated_properties = nil # dont use any current associated_properties
+        props = props.merge(event_pattern: details)
+        associated_properties(props)
+        # Eager define resource
+        resource(events_rule_definition) # add associated resources immediately
+        @associated_properties = nil # reset for next definition, since we're defining eagerly
         add_descriptions # useful: generic description in the Event Rule console
       end
 
+      def events_rule(props={})
+        @associated_properties = nil # dont use any current associated_properties
+        associated_properties(props)
+        # Eager define resource
+        resource(events_rule_definition) # add associated resources immediately
+        @associated_properties = nil # reset for next definition, since we're defining eagerly
+      end
+
+      # Works with eager definitions
       def add_descriptions
         numbered_resources = []
         n = 1
-        @resources.map do |definition|
-          logical_id = definition.keys.first
-          attributes = definition.values.first
-          attributes[:properties][:description] = "#{self.name} Event Rule #{n}"
-          numbered_resources << { "#{logical_id}" => attributes }
+        @associated_resources.map do |associated|
+          # definition = associated.definition
+          # puts "associated #{associated.inspect}"
+          # puts "definition #{definition.inspect}"
+
+          # logical_id = definition.keys.first
+          # attributes = definition.values.first
+
+          logical_id = associated.logical_id
+          attributes = associated.attributes
+
+          attributes[:properties][:description] ||= "#{self.name} Event Rule #{n}"
+          new_definition = { "#{logical_id}" => attributes }
+          numbered_resources << Jets::Resource::Associated.new(new_definition)
           n += 1
         end
-        @resources = numbered_resources
-      end
-
-      def default_associated_resource
-        event_rule
-        @resources # must return @resoures for update_properties
+        @associated_resources = numbered_resources
       end
 
-      def event_rule(props={})
-        default_props = {
-          state: "ENABLED",
-          targets: [{
-            arn: "!GetAtt {namespace}LambdaFunction.Arn",
-            id: "{namespace}RuleTarget"
-          }]
-        }
-        properties = default_props.deep_merge(props)
+      ASSOCIATED_PROPERTIES = %W[
+        description
+        state
+        schedule_expression
+      ]
+      define_associated_properties(ASSOCIATED_PROPERTIES)
+      alias_method :desc, :description
 
-        resource("{namespace}EventsRule" => {
-          type: "AWS::Events::Rule",
-          properties: properties
-        })
-
-        add_logical_id_counter if @resources.size > 1
+      def default_associated_resource_definition(meth)
+        events_rule_definition
       end
 
-      # Loop back through the resources and add a counter to the end of the id
-      # to handle multiple events.
-      # Then replace @resources entirely
-      def add_logical_id_counter
-        numbered_resources = []
-        n = 1
-        @resources.map do |definition|
-          logical_id = definition.keys.first
-          logical_id = logical_id.sub(/\d+$/,'')
-          numbered_resources << { "#{logical_id}#{n}" => definition.values.first }
-          n += 1
-        end
-        @resources = numbered_resources
+      def events_rule_definition
+        resource = Jets::Resource::Events::Rule.new(associated_properties)
+        resource.definition # returns a definition to be added by associated_resources
       end
     end
   end