funktor 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ca7738fdb4ce7e628d489b4eafa1975036cc1e82ec162bc4115383ac2b29233
-  data.tar.gz: 0a328bcb1d0c5a007d560eda72d88832269f9d21def9bfea3720746600f828f0
+  metadata.gz: 3a92d7870ba1cde9f91c5d872aab7e5dcc9d7a0d9ee8b4deb75fa1e679ea6ddc
+  data.tar.gz: 79d938d9d46f9763ae6bf7001bf54bb1ad48eefee0a0b5dcbb624a934edbba85
 SHA512:
-  metadata.gz: 274578bd0e322e8cb4d5bfbdb27c5aaa97d966e37bc3e38ef63cec5536947e132f9b5018b78ba52f6d492ed73ba8f46ac872614b750bcb4fab425613c5eccbfe
-  data.tar.gz: 454d9ffaf4970543f409be989ce455717c5f600e81c85f6ba8aea640867d232c4aaf2ec9b8f79e7956da53db197668a6bb37627de5c18ceac8a9348dfe527521
+  metadata.gz: b741a360102285bc392c6b846677b1859dbb02652b9e9412773fa989172c4a2368429f7825736f4438a543f4ac058098884fd78ce8a8f89be81b10f6b2e4db94
+  data.tar.gz: a450bec63e833671d3eeb7e4e1f00c38eec6c66c59de610ba431f8660a1273dac0ab4db85ff7b41ca2ff9e234c19f771087127d16ab2a21612b731ed61678609

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.2.5)
+    funktor (0.2.6)
       activesupport
       aws-sdk-sqs (~> 1.37)
       thor

data/lib/funktor/cli/init.rb

@@ -30,14 +30,13 @@ module Funktor
         name
       end
 
-      
-
       def funktor_config_yml
         #template "funktor_config.yml", File.join("funktor_config.yml")
         template File.join("config", "funktor.yml"), File.join("config", "funktor.yml")
         template File.join("config", "ruby_layer.yml"), File.join("config", "ruby_layer.yml")
         template File.join("config", "package.yml"), File.join("config", "package.yml")
         template File.join("config", "environment.yml"), File.join("config", "environment.yml")
+        template File.join("config", "boot.rb"), File.join("config", "boot.rb")
       end
 
       def package_json

data/lib/funktor/cli/templates/config/boot.rb

@@ -0,0 +1,16 @@
+# Point at our Gemfile
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+# load rubygems & bundler
+require "rubygems"
+require 'bundler/setup'
+
+# Set up gems listed in the Gemfile.
+Bundler.require(:default, :production)
+
+# Load all ruby files in the app directory
+Dir.glob( File.join('..', 'app', '**', '*.rb'), base: File.dirname(__FILE__) ).each do |ruby_file|
+  puts "require_relative #{ruby_file}"
+  require_relative ruby_file
+end
+

data/lib/funktor/cli/templates/config/package.yml

@@ -3,6 +3,7 @@ individually: false
 include:
   - Gemfile
   - Gemfile.lock
+  - config/boot.rb
   - app/**
 # Evertyting is excluded by default with serverless-ruby-layer, but you could use
 # the lines below to exlude files that are inside an include path.

data/lib/funktor/cli/templates/lambda_event_handlers/incoming_job_handler.rb

@@ -1,4 +1,4 @@
-require 'funktor'
+require_relative '../config/boot'
 
 $handler = Funktor::IncomingJobHandler.new
 

data/lib/funktor/cli/templates/lambda_event_handlers/work_queue_handler.rb

@@ -1,13 +1,4 @@
-require 'funktor'
-
-# Bundler is hard to make work because AWS includes some gems in the basic ruby runtime.
-# We're probably going to need to use containers...
-#require "rubygems"
-#require "bundler/setup"
-#Bundler.require(:default)
-
-# TODO : Ideally this wouldn't be needed
-require_relative '../workers/hello_worker'
+require_relative '../config/boot'
 
 $handler = Funktor::ActiveJobHandler.new
 

data/lib/funktor/version.rb

@@ -1,3 +1,3 @@
 module Funktor
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Jeremy Green
@@ -116,6 +116,7 @@ files:
 - lib/funktor/cli/init.rb
 - lib/funktor/cli/templates/Gemfile
 - lib/funktor/cli/templates/app/workers/hello_worker.rb
+- lib/funktor/cli/templates/config/boot.rb
 - lib/funktor/cli/templates/config/environment.yml
 - lib/funktor/cli/templates/config/function_definitions/incoming_job_handler.yml
 - lib/funktor/cli/templates/config/function_definitions/work_queue_handler.yml